Moved merge of typeHandler options before defaults

Fixes issue where default base field options were merged before type options, so type defaults like 'length' were discarded.