Could we get this pre-split by the parser like we do for overrides perhaps?