Git did some crazy stuff; cleaned up.