Little optimization from dogwatch

See comment in commit 420c93a