Fixed refactoring issues related to typed Ids.
Authored by: jwjoubert 2014-11-23
Parent: [r31192]
Child: [r31194]