[simplify] protect work in progress by define because it is still failing
[buffer] Avoid accessing pieces if no pieces were added