Cleanup and use of latest resilient improvements in lamp stack.