Fix comment issues when splitting rules