Shorten some code lines

Just for the appearance: tricky to pick up as "@@" is rather a long
piece of text once replaced.