Update some optdefs...
Add some more optdefs, courtesy of the hackiest parser ever