Revised how context is determined and removed unnecessary "parameter as variable...