Fixed up type system.