Fix opaque type warnings on R16B.
Merge pull request #71 from remote branch 'cmeiklejohn/csm-r16-compat'