More improvements to datatypes, eager selector collapsing, improved collect model info. Also fix bug in model post-processor.