Buildmaster cleanup

Some cleanup is perhaps advisable before making the code public.