Cleanup from #124.