Upgrade to doctrine 0.0.4

1. ensure all tests still passing.
2. ensure calls to doctrine's stringify are invoked correctly.