Super minor enhancements to v2.