Probably the right fix is to remove 'current' special value entirely,
but I don't want to see regression test failures until that happens.