Bring back simple callback support (#32)