Ironically we had previous optimizations to force v4 bindings,
which now causes a number of exceptions in the engine.
Some of the bindings have also been simplified.

Change-Id: Iaed0c9dbb2d01aeaed25f2ada571dd8177a5b7c2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>