Updated redirect arg handling to only happen when needed.