Add a few more interpreter replacements, from tonnerre@