Drop two confusing definitions

Both of these words are sometimes used in very different ways. Closes
#463.