Added the (tokentype) and (sink) cases for Term.
Added the (withtoken ...) case for UserAction.