Fixes for odd CALL behaviour.

This fixes #31.