Include Arjan's comments uptil the Type section