Fix conversion operators.
Remove old lambda code.