Weird... I think you're right about that UID thing. I went ahead and took away the ! as it doesn't make sense to totally ignore what gets returned. I think I've actually wondered before why I was missing UIDs in my payment tracking table.

Also, I think you're moving in the right direction regarding card profiles. I'm not totally happy with the way things are now either. I'm not sure that it'll be necessary to store them in external files since they're not going to be changing fast, but even just defining them in a single function the credit card module would work. I suppose it wouldn't hurt to make it a hook up front for the off chance that a new card type gets discovered somewhere that we need to accommodate.