Two new species of Optatus Pascoe and Macroptatus Heller (Coleoptera, Curculionidae, Baridinae), with a reappraisal of generic characters