Fixes #26. Package dependency cycles eliminated.