change if/else to match
test harness cleanup
remove unused fn, make SELF_KEYWORD_NAME public
comments
adjust self parsing not to discard existing context
get rid of keyword idents, replace with names

should prevent future bugs