"Simplify" the Point function

Primary reason is so you can use Point instead of SetPoint in all
situations, even where args < 5 in total
Switch to Point, Size, etc. and some tidy up