Now we should actually be merged. Jon's changes and Adam's changes that
incorporate the new mode type work quite well. Test it!