Add shorthand and logic tags.