I committed the previous patch, which was of course much simpler.
No problem.
I appreciate the effort to restructure the code, but I felt this was too much surgery during beta. Maybe we can consider this again later (or not). Thanks.
Thanks. If we accumulate more checks in this area or if this refactoring becomes necessary for a planned improvement, I will consider this. For now this looks fine to me.
