Follow-up to #11684: Minor comments cleanup, switched popFlashMessages() to public...