Update 'pointer-to' operator and 'when' statement