Several small fixes to name binding definitions.