Builder: Remove var-replacing-return in built files

Closes #204