Fixes #128.
Code grooming.