More cleanup in experimentlib.