Good catch, I thought I had refactored them all correctly.