Tweaks to waste schema.
Merge.