Another micro pull-request, I should really get better at bundling changes...