Cleanup from #119.