Use updated build script. Minor style nits.