Added and moved appropriate consider_evicting_current_page calls.