Fixed formatting, moved traits out of parser.h.