Fix keyword substitution by providing the appropriate type.
Authored by: jruigrok 2008-06-28
Parent: [r7269]
Child: [r7271]