Minor cleanup
A better fix for checking single-character expansions