[FNA #147] Input style cleanup fixes.