Hygiene: Complete merging of special nearby code with nearby pages code

phew.
Clean up lots of cruft in the process and fixes bug 53773
Update README with additional note about naming conventions

Change-Id: Idfb28aca4df067cb4051c6df84f6b2cd83280b36
Merge "Hygiene: Complete merging of special nearby code with nearby pages code"