Made Q have better generics support made possible be v0.9.0.1. Also eliminated redundant function definitions in express.