Type-safe attribute map; minor tweaks to Affirm & Multitudes