Cleanup: define binding-locs as a multimethod for extensibility