Switch to comments scope upon adding acomment, as per #1101