upstream changes, and consolidate fixed vec macros now that multi-item macros work (woot)