Greetings everyone,

	OK. This is the last thing of this nature I'm going to submit... After
all, I started this. No need to take this above informal spring
cleaning...
	James, Alan is right. No need for #ifdef's *when* (and only when)
there's a better way to do it. Thanks.

This is against 2.4.17.