Resolve Capstone trim errors

[ds5678]

@js6pak's changes were merged upstream, so this package includes all his improvements, in addition to:

• The other upstream improvements made since then.
• My fixes for trim support.