2nd attempt: Fix code style to make travis-ci happy.