Tweak the conditional pieces

/cc @hampelm