Humongous commit. Practically everything touched.