Move variable checking to check_valid_variable_name function.