Pull in final L-related code changes and other fixes.