Added substitute-if and remove-if.