Making `e' and `@-holes' special variables, in addition to `b', as in your patch, does seem to work.