Revert "Revert "couple of minor tweaks to data binder""

This reverts commit a767bf6e1e91315b821fbb696b9b941f2dd6cff5.
fix failing test

The code was returning from a closure.  A recent refactoring removed the closure but left the return statement.