Minor cleanup here. No "real" changes!