Fix warnings for shadowed local variables

Use the "Hidden Local Variables" build setting in Xcode (GCC_WARN_SHADOW) to see the warnings at compile time.

I did before and after screen shots to make sure the background fill and strike drawing didn't change so I'm confident in this change.