Cleaned up 25507d6b9b32808c4d90255e5c1c029fccc2afd2. Added template helper binder.