Clean up shadowed/unused warnings