Improved type system.