Further refactoring (not really necessary; feel free to close the report
without applying):