Cleanup per magnar's feedback.