Only update the vocabulary when requested.
Formatting improvements.