Fix more code formatting. Pull in changes in #52.