Ok, I'll handle the deprecation message in a separate pull request and work on making it appear more accurately.