bug 1018551 - clean up redundancy in the font/shaper code. r=jdaggett