Move all the things to pointer values.
Fix failing tests.