Is simplify needed here and throughout, or will something less compehensive work? Can @mattpap comment on this?