Reorganize so that --noplugin will work accordingly.