partial work on code cleanup post-hasPart implementation