Put in Zack's even more simplification improvements