Distinguish between types and units (rwbarton, #27).