The remaining cleanups are to switch to using pfn instead of vaddr, and improve readability. -- Brian Gerst