Second pass on #384