Tweak workunit refactor