Switch to a macro-based pcall system