Update with feedback from José Valim and meh.