TACHYON-198 Address comments from pull requests.