Follow-up on Mike V's github review comments.
Cosmetica.