Removing unnecessary level of indirection.
Fixing court transform for charges.