C callbacks cleaned up and ported to new API