Some type-inference work. Not yet hooked up to main pass.