Miscellaneous

Miscellaneous compiler-safe immutability and scope changes.