shared: Minor tidy of various shared files.