Correctly parse <indicator/> contents, Parser rejiggering