We change styles as we modify the code; please use the new style and don't worry that it's inconsistent per file.