Ok - If we're going to have these in the defaults, then we need to comment these lines as to what @3 @4 @6 @7 mean in connection.notes.spf_helo as this made me scratch my head for a while and I wrote the plugin!