Last commit prior to dynamically created callback structs.