DRY fixups