I think the reported "issues" couldn't really happen, but it seems better to refactor to get rid of them.