Maybe I can take another look at some point in the future, regardless, and see if anything else could use culling. I'll see if/when I have the time to get around to it.