Blank key values fix.
Clean up possible leak locations.  I don't think the pages should be
static however.  It works but perhaps final was the only modifier
needed.