Clean up code from #156.