Change m_pending_variants to a vector

Fixes #358