Minor followup to r83814, also fix some other existances