Modified FDEFINITION to conform to recent decisions.