I forgot to lint, so I'm resubmitting these patches.