Fixes for #16. Remove BaseID and WithId outsite cake pattern.

Previous PR rebased on v0.6.x.

Fixes #16