Merge "Properly initialize some instance variables."