Making slightly-more reg-expr friendly.