Minor improvements following an Xcode anaylsis.