Moved to using local variables in partials (on advise from rails_best_practices).