Minor changes to BIND-ARGUMENTS; moved code