Since it looks like no other solution will be accepted, the only way to 
fix masquerade is to revert the 'mostly static' optimization which
went in last year.  The patch below does so.

This fixes bugzilla #227.

Phil