Code style has been fixed, and a comment that this workaround
should be removed once #386 has been closed has been added.

Signed-off-by: Johan Sandelin <johan.sandelin@gmail.com>