Refactor those monstrous comment calls.