Completes enhancement #64.