Changed the way I mark several expressions as vulnerable.