Fixed minor inconsistencies. Refs #3189.
Prevent unreferenced local variable warning in windows. Refs #3189.