Minor improvements in memory consumption and exception awareness.