Improve select-time modularization.