[Eilserves]

I did raise a bug report after I posted this (couldn't remember the link at the time I posted) but will use this work around for now.

I had tried a similar approach with an override, but I must have had the wrong code because while it never threw a compile error, it didn't work.

There are a lot of other advantages that seem to "linger" as well, but I'll toss the doneif into overrides for them on a case-by-case basis for now.
Thanks Duggan!