Moved helpers to Substance.util.