data-binding: refactoring / cleanup of new @Model support