Restructure to avoid bad things with unknown builder

This still isn't totally satisfactory... Android-mode basically just
appears to stop working, and the error message never really gets seen...