Adding after-zero and before-zero trees seems to help