They share some logic and use so avoid code duplication and hidden missing pieces.
Fixes #23 (closed)