Minor cleanup: