John branch

Don't need modifier -- for these two, I think figure__caption and figure__img will do just fine.