Revert "Bind simplifications and refactions."

Not ready yet. See #855

This reverts commit 146eb9a5c5dcad6299629867e40ff80e670517af.