Clean up handling of zero-argument functions