ParametersParser refacor

WIP
I guess my point is – handling this in contentXXX will make the parser simpler no? (=less code)