Clean up bit clobber workaround