Cleanups with record update syntax