Third pass on #384