This is orthogonal to my patch; I'm happy to just let @loudwinston add it in here.