I am suggesting extra changes as long as you are touching this section of the code. 

It looks like not all of the rcparams are followed here (baseline) so you get to squash a bug while your at it.