Idiomaticity improvements in plot_disc.R.