Clean up option parser
Allow capture on anonymous function calls