@dimroc => long overdue, some quacking improvements

Based on your last comments, it's basically a bit of cleanup in the RSpec topic.