Tiny tweaks for use with the token macro plugin