refs #6560 A few slight additions.

Quite trivial. E.g. sorts out indentation in in IndirectCommon and uses old API temporarily in IDA.