Major cleanup of extantz, part one.