Actually fix variable expansion.