Fix #371: Multiple warnings with -Wshadow