Add offsets to formal parameters. Works towards #36