Working on #125.  I don't think the behavior is quite right but at least
it doesn't break Vrapper anymore.