[bug 1050565] Cleaned up selections a bit.