o Some code tidying up through better patching PR: 91485 Submitted by: Tod McQuillin <devin@spamcop.net>