305 follow up comment responses

Updates for all comments except for the replacing Const#Artifact with an enum.

I much prefer an enum over a String constant but looking at all the touch points it feels like doing so will just make the code harder to read, so I've left it for now.