Correct PI constant scoping as discussed in #424