Cleanup some work on #459.