bugfix and cleanup briefabusecfunction et al