More tillweb speedups

Will it ever end?