This has also changed a bit with the merge, though, unfortunately -- the modifiers aren't in the type anymore, but in the SymLoc argument.