simplify type variables
add form type collector for better performance on index
migrate form type references to collector