1) Nonstatic definitions of set/get functions, same way as RHEL does it.
2) minor fix with removal of duplication, which didn't affect compillation.