Adjust parsing the arguments, we now only need them for the parser.

Change-Id: Ibf4ee8358f7eb75854c8b6ca9be25b1288eb045d
Reviewed-by: Niels Weber <niels.weber@digia.com>