Apply push 3

Fix the final issues preventing infer from working as well as subtype for apply.