Little less brittle code.