Re-submit r194551: Use empty() instead of size() == 0.