Anorm storage: Only add annotations to a span that do belong to the span.
fix up pull request 298 for anorm annotations applying to all spans
formatting fixes