Add a/v/h/q/t parsing.
Add test for q/t; delete old bug thing.