Simplifying subject type to just be a string.[#424]