Better support for @skip and @wip tags