Simplifies the with-db macro
Merge pull request #1 from ls4f/rework

Simplification of the with-db macro