Trivial tidying up.