Log Message:
opt:foo:bar and rename:foo:bar are synonyms for mk/wrapper, but not for
the new wrappers, so just use the former.