UC-86 Added more docs, made return value consistent.