Simplifying the number of guard conditions

The log decorator had a number of guard conditions protectiong the log
writes. This commit simplifies those, there is only one guard condition
instead of three.