Minor Rails-4-inspired cleanups