Issue #17. Fixed -Wshadow.