Set of cleanup fixes.

Readability improvements to oflib/ofl-messages-print.c.

Clean up of *.bak files that were added with first commit and are not required any more.