Hi,Cleanup and fix a few issues reported by Yanfei.Waiman, I didn't preserve your reviewed-by, because there's a few extrachanges, and I've not yet boot tested them.