Some refactoring was needed after the Coretext rework yesterday.

It does crash at run-time, though.

Also, remove the no longer used source files from our older CoreText
attempt.

Change-Id: I54d221ade846866d7a9457acd50219c74c68e8cf