more future parser improvements

as per subject.