Cleanly handle varscan cleaning case when line previously removed. #491