Cosmetics: reduce string concatenations