Modularization in progress -- select now pluggable.