Fix bcond_with placement within the header and its bracketing.