I mostly wrote this MR due to the last patch, but noticed these two other details while working on it.