Refactoring to demote more stuff in DatabindContext
cleanup of eclipse warnings