Also: 1. Other minor fixes in comments touched by this patch. 2. Add a separate test for subpage with spaces. Change-Id: I267f19027098e5778b1cd491826e1741fc7ee794