Tweak logic in master-bus packing to make it clearer; will also minimize conflicts...