Oops, that's exactly what I meant to do but I guess I got distracted and forgot to finish it :)

PR updated.