Revert "More of the exports = function()"

This reverts commit 6193c18c6730ae7a571b0722f9c17aeb08e01a11.