Whitespace cleanup after freebsd fixes merge