Polish up r45109 (changes to header id generation)