Switched cuttlefish RHS subs to $ syntax