sql.py: map_expr(): Fixed bug where names were being matched inside punctuated names replaced in previous calls of map_expr()