Some more tweaks to composition.addBindingHandler.

Helping to ensure that "this" is correct from within the original
handler. Cleaning up some code, etc.