More calx mayhem.
More calx tweaking.
More calx adjustments.
Merge branch 'test' of https://github.com/urbit/urbit into test