Working on better creation context integration.
Authored by: mgricken 2009-08-27
Parent: [r5033]
Child: [r5035]