Rejig the types (refs #20)