data-binding: minor refactoring and cleanup