Bring the build infrastructure into line with my conventions.