Small syntax improvements in 58.