Making some adjustments to CaQL decompiler.