More tweaks to immutability example