Merge change Ia1dc94d5

* changes:
  Encode recommended practice wrt libffi in comments, and attempt to actually follow those recommendations.