albel727 Fix expect() messages and refactor ffi callbacks a bit

Latest commit 2d74778

Jan 14, 2018