Minor cleanup (introduced with the refactoring of siox-skeleton-builder).