Update to latest express prototype

Bring in changes from main repo.