Refactor calls to keytype_from_text()

Non-test code always has NULL as second argument.  Eliminate the branch that
tests for non-NULL, and keytype_name() since it's only called by this function.
And eliminate the related tests.