fix_scan_expr was also exposed
cosmetic changes