Minor refactorings for build.rs

Minor refactorings for build.rs #533