Now, ACTIVITY-VOCABULARY solely contains class definitions; all parsing/encoding is handled by the ACTIVITY-STREAMS package.
Slightly less wrong, feels slightly less redundant!