Good catch, this is for me to clean up before I submit the final PR.