Added RETURN-IF and FEATUREP.