Further changes to improve performance of the symbol vector generator.