Some cleanup for the previous commits for @mentions in notification comments