Reset buildDictionary. Apostrophe scheme works.

Reverted buildDictionary to G's version. Implemented more concise
apostrophe scheme.