Avoid always linking strings to commons; add other possible types in comments