[7.x] Refactor some publish state code

[duncanmcclean]

This pull request makes a couple of small improvements to the publish state code, added in #506.

Nothing major, just making the code slightly more readable 😄