More cleanup in vocabs.py