Please at least merge this; the branch as-is does not build for me without fixing some of these pointer signedness issues.