My bad. Looking back, I realize it wasn't worth the trouble of modifying the existing methods to DRY the arrays used. Removing the TODOs