Deal with all dimensions. Refs #9202

Also use proton charge