Updating: adding support for extval declarations
Updating: changing: extval -> extvar
Updating: minorly tidying-up