Simplify behavior of Keyword class

In response to comments by @embray
Clarify handling of units