Reorganize build parameters a bit