Minor patch cleanup.