Smaller refactor; bugfix: contextual actionbar selection disabled when deletion in progress.