Some more tweaks. Adding a reparser, because sometimes one just isn't enough...