Add option to discard non-normalized entries in DictionaryBuilder.  Other minor improvements.