Fourth pass on #384