Also, not part of this PR... just thoughts while reading the code.