Revert "Make a couple of more returns param"

On to the next one

This reverts commit 9a8ff74e68a0a9a3a8081e08d3de0be448983be9.
Try using module _defaultOf for range