Some cleanup in an effort to make this work with changelist view.