Weaken a pile of collection declarations, attempt to fix JoinCommandHandler