Various enhancements in CalStructDisplay function.