Reduce duplication; make accessor definition more explicit