I'm going to leave this alone; it works as-is, and I'd rather remove the legacy codepath entirely (see #47 ) than add microöptimizations.