Refactoring without a net.  I guess it's time to get the ugly android test harness going.