Major rework.  Fairly serious bug required disection.  Trial is much
happier now.