Improved Analytics page tracking (See #2).