Recognise singleton classes
basic static conversion
Also remove semi-colons