Good idea on concatenation. Will add a separate rule for that as well. 

I'll keep the log.isXEnabled rule for now, and we can certainly remove it after the cleanup.