Merge "Fix improper declaration/use of pointer."