Style changes to match doug's WAAPI test