Fix rare bug

Fix a rare bug where if the first line of a function is a function call,
an extra param field is inserted.
Also improve return type detection for UEFI, ignoring EFIAPI.
Remove extra print statement