Merge pull request #1014 from b4n/streamline-builtin-tags