Avoid the sadly eager Part handling code