Bug 1000550 - Make warnings less stern, where applicable

CC @jvillalobos