I hope this is ok

[Jesse Kuhnert]

Let me know if what I'm about to commit isn't to anyone's liking. The
eclipse warnings were driving me mad. There are two visible warnings now.

jesse