Fix -Wshadow warnings

Should fix #3.