fix unit-unit optimization, add return-update optimization
fix unit-unit optimization, add return-update optimization

darcs-hash:20060128195428-1a7c6-198efdaedd9936896fb95ef826a4f5449b58821a

kirbyfan64/jhc,kirbyfan64/jhc,kirbyfan64/jhc,kirbyfan64/jhc