I was less confident in my code before a more recent refactor. This can basically go away now.