WIP: Attempts to get wait-for-handoffs-to-complete to work properly.