Move some presto-main dependencies into Raptor