More type system tweaks.