Remove type definitions where I used them wrong (and wasn't sure what went in there). Correct the
subscribe definitions.
Update spec definitions.