Let's use the updated syntax on these guys too.