Minor changes to ensure compatibility with 'strict' mode.