Fixed formatter_base.
Minor other tweaks.