Add check for trailing '_' on _unsubbed_keyword.

[shpx-zfsg]

Add check to avoid removing last character of strings like 'ora' where 'or' is a keyword.