Move the optimisation of default function arguments to the beginning of simplify