Better testing for quotes.
Only try to expand abbreviations when supported. Close #151.