Update deprecated idioms