Oops. Two small typo-bugs in last commit. Fixed.