Another one down.

- That first one looks like it might be done too, but I should make an explicit check.