Clean up binding-model stuff a bit