=== Message

Refactor the code to not need these conditional compilation directives.

