Added PropertyIsBetween support
Fold.
Subtle fix.
Refactor II and STII.