Cleaned up some ruby?/erlang? switches in common code