Refactored @brief handling to be more explicit, fixing subtle bug for non-namespaced output in the process.