(cleanup) Updated for latest rust conventions.