Cleanup binder code, support static properties