Follow kibit suggestions.

Fix #2.