Cleanup things in modcall and fix missing closing brace