Patch from Felipe Kellermann, remove some unnecessary dups, i declared a few extra const's also.
5 files changed