Fixed two bugs found during testing (renaming parameter clears value + fails to extract "embedded" template parameter)