Try to keep annotations on a single line

@swankjesse