Cleaned up the basics. No need for where when we have r@(Record x y z)

I know I already did a VERY SIMILAR version already, but I've deleted that repo and re-done this. Yet improved again. Sorry about removing the previous copy of this, I just wanted a single diff. :P