Cleaning up the composition handler interface. I'm happy with it now.