r49: use definitions suggested by Alec