Added unspread padded parts as well.

- Might eventually remove the unpadded parts, since
  they can easily be derived from this.