Blender Git Loki

Cleanup: Use more logically constructed ELEM macros

- name primary comparison var 'v'
- names remain same when expanded
- no odd mixing of macros, use prev ELEM + extra arg
- use 16, even if not used yet, saves adding more in future