Cleaned up drop callback design.