Yet more formatting updates for yet more API classes