Move some things around and remove 'paramindex' var (just use 'i' for that too).
Signed-off-by: Stefan Knoblich <s.knoblich@axsentis.de>