Fix variable declaration

Commit ab7250e5 addresses the variable declaration of record and selector to avoid them being unset post assignment.