Hi… I am well aware that this diff view is very suboptimal. It will be fixed when the refactored server comes along!
Note TODO on using nullable throughout ffi
* ffi: use nullable throughout