Switched to use lambda-fiddle and trivial-arguments