Don't extend Stream from SplStack
Some minor cleanup.