[#79750556] Mostly simplications