Add missing `$notice` to suppress debug notices. Remove trailing whitespace and a few more code-clean-up bits. Props imath. See #5623.

git-svn-id: https://buddypress.svn.wordpress.org/trunk@8443 cdf35c40-ae34-48e0-9cc9-0c9da1808c22