Use our new object.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Drop this field now.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Save some queries.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>