Dissector bugfix and code style.