Remove comment expansion-related code.