Streamlined the build procedures a bit.