Further article spec cleanup