Uncommented some code.
Passing tests (with wbyoung).