Moved the code to combine interpolation and stoarge qualifiers to the parse helper. TRAC #23745 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods