Simplify extract for #55.