Merge "Centralize EC_MULTISYMBOL error checking." into nextgenv2