LP#1243023: Clean up string handling variable types