Some minor cleanups of redundant computation