These errors were revealed by improving the types for `withServices`.
Where this component is used in `AnnotationQuote` the code has been
refactored to avoid calling the `quote` function twice and more
obviously handle the case where `quote` returns null.