Cleaning up some impl
Update to khepri V0.6.0
V16.0.3, updated tail call impl