More control over extra pieces in separate.
Closes #19