Added a proper substitution context class. Changed ArgumentFilter to be a selector. It is now called HTMLSelector.