Unfortunately, the code changes did not hide the categories with no products. When the switch is set to 1, I can still follow the menu to:

"There are no products to list in this category."

I suppose I need to hack some menu code to make that happen...