Proposed API changes

Sorry it took so long. I felt bad asking for a shirt, so here's something that's hopefully helpful! I'd totes write one for Gulp, but I don't use it.