Issue 427 - Remove non-standard function and getter syntax