Not directly related to this change but it occurred to me while I was looking at it - why not to just check for veUIEnabled in isAvailable function?