Fix undefined argument errors.
Merge branch 'refactor-build' into mine