PHP-1225: Fixes after review.