Reduce some duplication in the base example