General cleanup and improved Lambda loader impl