Remove BaseID and WithId outsite cake pattern.

Fixes for #16.