Minor cleanup after preceding changes