Miscellaneous changes in code structures