Fix for overeager commenting our of vars