Base: Minor cleanup to pass JSHint