Minor code rearrangement
Remove the hard-coded alignment from the FFI code
Renamed the cursorset dis to cursorSet
Remove GADTs and switch to newtypes