Removing a second, unnecessary typedef