Followup on a98d9ca08a83c9a277da5b5525542be08035af71

Still don't understand what the proper idiom for this is, but for now
avoid the problem.