Added some missing generic bounds.