Fixes for vocabulary analysis.