Cleaned up some code.
Fixed issue in 'FieldCanBeMadeReadOnlyIssue'.