YAY!  Found it.  It took sooooooo long to fix this regression. XD
Readability improvements.