Added type parameters to opaque type specifications

It all builds after the change, but I only changed the parse in one
place, so probably more needs to be done.