More correct logic around determining two sub-issues of issue #430.