TEIIDDES-2306, TEIIDDES-2391
* remove offending setDefaults() call after selecting new type
* changed FunctionForm constructor to use raw form category and not
perform toUpper().