Tweak build so that RDF steps are optional