Could more diligence in the codebase solve this?