RTD revealed in Doctor Who Unleashed that he deliberately gave NPH's Toymaker a slight racist streak as a callback to his problematic roots.
…I wonder if this is why he chose "Spice Up Your Life", with its controversial "yellow man in Timbuktu" lyric, for the musical number?