[#2114] Simplifying a few things with disabled/readonly