Cleanup

Combined black/white code parts for genCaptures and genPromotions