Continuation from Capstone2

One accidental commit on capstone2 complicated things - so I've copied
over what I had here.