Also fix not working
Closes #3383.
Not required (this change does not affect logic) but improves clarity.
Also cleans up some redundant/misplaced comments.