No problem. I couldn't figure out how to get the second PR to stack on the first one because the branch is in a fork, but the diff should be much smaller once the first one is merged.