Fix small error in previous commit, which was two changes that should not have been combined; the first change was to improve breakpoints in debugging and was not mentioned in the commit message. Ugh.