Cleaned up logic related to compose bindings