Address @housejester's comment plus some rationalization