sweep up other cases of DKeyword vs. DRef

hopefully the code base is more consistent in its use of Keywords and ident references.