Prep for the vocabulary pre-proc/expander :ocean: