No longer using any old code from Extended Choice Parameter plugin.