Yes. My latest commit covers everything but the change of this case into an error (though it makes it easier to deal with).