More minor cleanup from merge