Add BeforeParser
Add AfterParser
Remove obsolete initialisers from AfterParser and BeforeParser