This is a step towards fixing #289 and removing some less-than-optimal behavior in plugins I maintain internally.