Miscellaneous refactors

I was going to add a feature but then realised that I could achieve what I wanted to using the Default Play Action setting. I had already made these refactors as I worked through the codebase.