Fix type/argument shadowing warnings
Merge pull request #18 from markhibberd/topic/fix-arg-shadowing

Fix type/argument shadowing warnings