These were limited to obvious cases. Some less obvious cases were kept as refactoring might make them necessary in future.