Minor DRY cleanup as suggested by the IDE