There are some outstanding style issues here, but we're going to fix them 
after the fact at Open Source Day rather than beforehand, just to give
participants some easy bugs to find and fix.