STS-3547: simplified type hierarchy cleanup handling and re-using a specific engine instance during a build