TOLTECS: Reduce a variable scope, move a variable to boolean