Avoid unnecessary duplicate storage and formatting tweaks.