Managed to further reduce astbuilder