remove the two uses of the $(or ...) function since it is only supported by