Merge branch 'rs/grep-expr-cleanup'