asmaloney Fix shadowed variables (#35)