Clean up refactor

A few renames for consistency.  A few more notes on reorder.  Need to
override CursorAdapter.getView(), thus also newView() and bindView().
We don't want to call Cursor.move() any more.  But bindView() doesn't
get the position parameter