Have fewer if conditions for straight guide propagation.#45

mtbc wants to merge 3 commits intomcvine:mainmcvine/acc:mainfrom

mtbc:reduce-ifsmtbc/acc:reduce-ifsCopy head branch name to clipboard