Moved a couple more parameter initializations from function calls, see #94.