Nah, that's too smart of a behavior. What exists now may have some edge cases, but it is otherwise staright-forward and intuitive. The only real "hassle" is swapping two large assembled pieces closer to the end of the game round, but it's not really a hassle. Not a big deal, really.