Refactor to simplify LocalBinding class and remove an extra warning