Models; a little refacto' with a
five-minute break in the afternoon;
this bugged me too hard to resist...