Use bool::then instead of then_some with function calls

Use bool::then instead of then_some with function calls #6907