Reviewed by: sam, bmah
These are not perfectly in agreement with each other style-wise, but they are orders of orders of magnitude more consistent style-wise than before.