More code sanitising.