Remove unused type alias, add strictness to delimiters