Fixes few piglits since clang r304193
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Looks good to me.
Reviewed-by: Aaron Watry <awatry@gmail.com>