Symbols support; format refactoring.