Minor Code Cleanups

Pollchannel need not be in any scope other than update() and poll().
This also cleans update's prototype up. This commit also makes the code
a hint cleaner.