It's always hard to remove another layer of indirection...