This occurred to me last night once I was away from the machine. It's amazing what a couple of glasses of wine can do for lateral thought.

I knew there was a square peg - square hole solution somewhere ; I just could not see it.

Your solution is more than adequate. Thanks for all your help.

-Gregor-