Removed the remaining warnings (shadowed bindings and one deprecated function call).