Fixing a few oversights from unbundling this plugin from jirafs.