Fix to #maintainable to properly support select lists.