Fixing embedded function declarations