Changes necessary for allowing this to pass JSHint.