Added unit, type ascriptions and pairs.