Refactor Rails 4.1 compatibility approach per Norman's suggestions