Code review changes discussed with modocache
Missed a code review item.