After we found the `@@` marker after the key to interpolate, we pretty much only need the offset *after* the marker. So let's just advance it instead of adding 2 in many places. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>