Return string-or-keyword, mark as deprecated

To prevent breakage to any users that may be using string-or-keyword.
Mark as deprecated to emit warnings when it is used.
It will be removed in future release.