Consistently enclose vars