Oh, this is scary! Should we work towards removing the short circuit logic (in a separate change)?