Yip.
Not part of this PR - but definitely needs to be done and I keep staring at it, making me thing I need to do it.

Should it not be?