Small improvements in forest logic.