Remove workarounds for non-ANSI-C compatible compilers (Part 2)
-Removing usage of OF() definition