Improvements to AsmSelect support