Parenthisized a #define to make it safer, adjusted some notes (and added a...

Parenthisized a #define to make it safer, adjusted some notes (and added a TODO) around some extremely obscure code that needs further attention but which is outside this scope.