Figured out the lint problem: I think this should be good now.