Revert "Experiment with inlining the _defaultOf method for complexes"

On to the next one!

This reverts commit 36dc2c2dbde4b220f53b10f05525fdffa1c3cf76.
Make a couple of more returns param